Code cleanup.

Cleaned up the UserBin code.