Clean up - Part 3
Clean up - Part 3.1
Merge pull request #21 from DrummingFish/1.6.4

Clean up - Part 3