code clean up to publish to App Catalog