Some cleanup advice from Sauerkrause