This is much more readable. Great change!