Agile Lab# 4 - Small refactor to conform to spec.