Working on cleaning up room view