little clean up and formatting