some rubocop inspired changes