Rubocop fixes and increase per method complexity limit from 23 to 25