Refactored application helper