Minor changes based on feedback