#1 - Code Refactoring and new class creation along with some methods