Initial commit
Minor style changes
Merge branch 'stylechanges'
Minor style changes