Cleanup code
Merge pull request #448 from dreamteam69/master

Cleanup code