Refactor string modules...