Done. Though the new code seems equally messy.