Refactored the Arrowhead exercise in this commit