cleaned up user.php