Some cleanup as per style guide