Refact 0607

- [ ] fix rubocop detections
- [ ] fix reek detections