I agree, this code looks much better.