Refactor: Move commands into class