Code Clean up
Merge pull request #87 from mnjuhn/master

Code Clean-up