a little clean up of the code