doing some clean up