Code

refactoring of previous commit + add separation to glyph renderer also