re-factor #11, parsing