Fixes #24 Strings reorganized