cleaning code
wip: resume points