fixup strings.
review comments regarding consistent signature of internal methods.