improving collection of results
tidy up structure