some cleaning up of functions from one file to another