move room callback to better place, comment