Fix standards
Merge pull request #11 from ss23/standards_attempt2

Fix coding standards