Refactored commands to run from a single method