Some attempts at prettier parsing