More rubocop fixes, final ones for today, only 7 to go