Finished refactoring commands, probably