cleaned up code
Merge pull request #1 from mechacrash/master

cleaned up code