Codestyle consistency