Don't strip strings and refactor #195 a little
Test better string output #195