Cleanup, rename, todos