more references, more cleaning