Cleaned up room layout