rename/reformat add_trait and make remove_trait