Arrowhead

Code fixes based on comments and rubocop.
Redundant `begin` block detected.