remove unnecessary String()s; rename parse functions