some cleaning/rework