Small changes based on feedback