Codestyle

Code style commits squashed together.