display cleanup, small bits of refactoring, &c