Cleaning up stuff and WIP