Minor cleanup based on feedback