Refactored arrowhead exercise v4.0