Update: clean-up
Fix: rubocop offenses
Fix: ??? test