Clean up - Part 2
Clean up - Part 2.1
Merge pull request #20 from DrummingFish/1.6.4

Clean up - Part 2