clean up source a bit