Changed some comments/indention on CommandHandler.