clean things up a little
add and remove some spaces
remove preferred room and add name param