Refactoring CommandHandler
Refactor Command Handler
Broken code sucks