Typography Update

Some cleanup