Readability improvements

Also, I think is more idiomatic Ruby
Merge pull request #36 from pikesley/reduce-complexity

Readability improvements