clean up and WIP