Cleanup and add todo