Codestyle issues