Arrowhead

Code fixes based on comments and rubocop.