Improve round/end output