Refactor running cli and command before methods. Closes #2