Arrowhead

Refactored the methods.