display: some more cleanups