Refactor code to avoid suggesting in hole results to be clearer