bunch of small clean up