minor refactoring of overview code