refactoring command_handler Charles :pear: Aaron