Address additional rubocop warnings