cleaned up workload class