clean up of some source code