Code clean up - first attempt
Merge pull request #4 from binaryking/master

closed