Some codestyle consistency