Refactored annoying 'app' references.