Cleanup codes [needs testing]
Merge pull request #1 from SmallJoker/cleanup

Cleanup codes [needs testing]