Cleaning up code smells - https://landscape.io/github/UltrosBot/Ultros