Added few corrections to comments. 
Few minor refactoring.