Commands code review - part 2