cleanup & comments :-)
clean API :-)