Glyph refactor