did some clean up of the code