little clean up and fix