Working on Refactoring