Cleanup strings

:+1: