Small improvements based on feedback