updates based on PR feedback
further cleanup of Arrowhead exercise