renamed some functions and variables and removed the setters for occupants list