more code clean-up
Merge pull request #76 from techAPJ/patch-3

More code clean-up