[WIP] Refactor 0607

- [x] fix rubocop detections
- [x] fix reek detections
- [x] refactor to command class