Factor individual commands away