start cleaning up string parsing