Refactor all commands