Refactor Room Class