more cleaning up, making sure all functions are .py