Cleaning up Styles
Merge pull request #423 from christopherleckie/master

Cleaning up General Styles