Refactoring Application: