a little clean up and file name change