Yeah, this is much better. Nice cleanup!