Cleaned up Theater.m