cleaning up the wip