Cleaned up job controller