Refactored to fix spelling, worked on Room class