code source clean up