Refactoring out into a file per command