Nicer typography

Can you merge these improvements?