Minor changes

Few minor changes and add some comments