minor formatting changes
Merge pull request #13 from gemmakbarlow/refactoring

trying hard to be consistent with master