Arrowhead

Clean up arrowhead exercise even more.