Clean up - Part 4
Clean up - Part 4.1
Clean up - Part 4.2
Merge pull request #22 from DrummingFish/1.6.4

Clean up - Part 4