Readability improvements

Also, I think is more idiomatic Ruby