Cleaned up UserData class