Clean up userfactory some, make factory methods static.