Simplify app code