Minor codestyle tweaks