Make UserSet acidic

Also made the code a little prettier.