Tidy up traits impls