Codestyle adjustments