cleaning up a bit
wip