small clean up changes