Fixed some minor style and formatting issues