Small cleanup based on feedback