basic whitespace and code cleanup
Merge pull request #1 from cmeisinger/initial_code_cleanup

basic whitespace and code cleanup