[selling] [cleanup] rearranged fields