style cleanups from rubocop recommendations