Minor refactoring, got results to display in UI