Refactoring - rearranging commands