Clean up whitespace and indentation
Merge pull request #28 from cndreisbach/whitespace

Clean up whitespace and indentation