Trait reorganising, documentation work