Minor codestyle fixes