Updated pull request with changes to conform to the style guide

I completely understand, getting a consistent look is very important.

Please let me know if there are any other changes that are required.