Good idea, far more readable. Done.