cleaner class structure
dito