Few minor changes based on feedback