Refactoring the app...