start modularisation of list + clean