Few additional changes based on feedback from review