App helper refactored
One more polish to app helper