cleaned up user class