Minor codestyle upgrades