Refactoring arrowhead