Some minor changes like uncommenting few lines of code etc.