I am tidying up the model associations for rooms and users