Minor cleanup in AppDefinition (redundant import, scoping)