Final Refactoring Done