Much cleaner now. Fixed.