More funkybob-inspired cleaning, added missing template