Complete Refactoring Done