rubocop cleanup
WIP version