Cleaned up Batch agent class