Cleaned up Job class