TASK-2: code review changes
Merge pull request #3 from DanLatimer/topic/TASK-2

TASK-2: code review changes