Cleaning up
Traits and evolution.