did some clean up on the code.