* Disable new code complexity tests in rubocop
* Fix a couple code quality warnings
* Minor simplification