Refactor some commands...