fix, cleanup