updated APP namespace to remove globals