Refactoring Done || Comments Added