some clean up, source common stuff from one file