Minor issues and improvements
whitespace