Refactor typograph