Clean up the code, and make it conform to guidelines
Merge pull request #122 from MarthaMadjack/develop

Clean up the code, and make it conform to guidelines