- [REFACTOR] Refactored the comments and re-arranged the code