simplify command creation
cleanup
simplify some more