Did a little code clean-up and house keeping
Merge pull request #102 from larsacus/code_cleanup

Did a little code clean-up and house keeping