Enable Rubocop Style/AlignParameters rule

Also, clean up code to be a bit clearer and follow the rule more easily.
Merge pull request #7 from promptworks/rubocop-align-parameters

Rubocop align parameters