some minor rework