Clean up some code
Merge pull request #1 from Michaelmvv/master2

Clean up some code