small changes and some clean up.