fix, clean up