Minor improvements / fixes for style consistency