Cleaned up master class