Code Review for Job #1

Code Review for Job #1 - Workitem available at https://www.worklist.net/worklist/workitem.php?job_id=1&action=view