Second Rubocop-based code cleanup