Fixed comments at Todo