collector code clean