Further Refactoring Our Application