MAJOR *formatting* cleanup
Merge pull request #52 from joshbeitler/feature/code-cleanup

MAJOR *formatting* cleanup