Cleaning up coding style, fixing room model bugs.