modularize commands