a little clean up for better readablity