Stying pass across the codebase. Fixing conventions.
Merge pull request #51 from capotej/style_pass

Stying pass across the codebase. Fixing conventions.