[wip] cleaning code