Add modifiers in unicode pretty printing; unify code using dictionary