Added TODO, do better performance in listDelete and make sourcecode a litte bit nicer ;)