remove duplicate import
use command map to avoid redundant code
extract parse_class to runner_util