Yeah, this is much more readable. Done!