I was trying to distinguish them from local variables, it wasn't a good step. Moved them directly to class definition. We now don't have statements like `catalogue_app = catalogue_app`