refactoring current room resolve