source clean up
more code cleanup