Few minor changes and added comments