CON-1233-results-section clean up the code