[fixup] iterator, private method etc.