Some cleanup

@davidsanchez It would be nice to get some more contributions to Enrico (see open issues). Would you mind putting "Enrico developers" instead of our names?