Cleanined up go dictionary parsing a bit, still lots to do