Minor codestyle fixes added