Cleanup, rename, todos 

same as above