Refactored protected methods
Refactored application helper to remove settings duplication