Fixed cstyle issues