clean up and make more consistent