refactoring relations between room and client