Start cleaning up string parsing