clean-up and fixes from rubocop
removed options duplication