Cleaned up strings some more