Fixing strings, and refactoring