Code: Cleanup.
Merge pull request #705 from am11/master

Code: Cleanup