Clean up todo a little.