More cleaning of code
More cleaning of code.
Code cleaning...
Merge pull request #58 from SHeimlich/master

Cleaner Code