changes, cleanup