Grammar correction and remove unneeded TODO