Improve cstyle