Refactoring - Added comments