Improve uniq