better display
cleanup