Code clean up - attempt two
Merge pull request #5 from binaryking/master

closed