I think the original code may have been fine as is.  Should I completely back out my change for this part or do you think this is a bit more readable?