Reorder code a bit better, use display version in always case