Improve typesetting