fixes from rubocop pass 1