Cleaning a bit the metamodel