Clean up and model classes, api transformers