Strings clean-up (issue #616)

Working to fix #616