Code formatting + CommandHandler cleanup