update rubocop and do some clean up with it