cleanup
more cleanup and added new room model