Fixed todo comments