Improve parsing function.