some more rubocop inspired changes