code clean up
wip