Refactor unit commandability