Refactored across the app