rework, cleanup