Merge pull request #1 from orthoplex64/master

Code cleanup
Comments