Refactoring (Code Works Still..No Need to Revert Back)
More refactorings