Little source clean up