add new comments, remove unnecessary method from Main and User class