fixes from rubocop pass 2