code cleanup
Merge branch 'master' of https://github.com/Budabot/Budabot
Merge branch 'master' of https://github.com/Budabot/Budabot