Did some code cleaning
Merge branch 'master' of https://github.com/LunaWorX/ConsoleTools.git