Some cleanup based on feedback