Arrowhead

Code fixes based on comments and rubocop.
btw, for these, you can use the .hound.yml in the root of this repo to have your local rubocop agree with this one.