Enhanced the comments
Significant refactoring