Code Cleanup

Code cleanup to make better use of the Glyphs API (thx @schriftgestalt)