Added generate_salt
Clean User