Cleanup, fix room form glitch