Refactor even more

* More idiomatic Ruby
* Clearer names
* Clearer method order