Minor codestyle improvements