Refactor the latest and greatest rdio-room