minor cleanup
wip