override path, clean up a bit