A different refactoring of the Arrowhead class