Allow creation of ESA model in create_feature_models.py, Some cleaning up