Rubocop align parameters

This is base on #5, so merge that first. If you don't like that, you won't like this.

Enables that Rubocop rule. Additionally, cleans up the code a bit so that it's clearer and so that following that rule is easier.