Added //ROOMFIX tag wherever refactoring is needed