Added cleanup methods and increased worker count