Minor cleanup of some display functions