Commented and cleaned user model methods