Cleaning up user class.

+ Pulled out logic into private methods.