Arrowhead

Arrowhead refactored code. 
Line is too long. [82/80]