More Code Cleanup
Merge pull request #82 from penguinho/master

More Code Cleanup