[CLEANUP] Move parser into a util