Cleaning up todo a bit.