cleanup: more composable make/model field; display results