Clean golriz parser
Add some simplified versions of data