Simplify output of glossary parsing to more simple objects