more cleanup and improve readability of the output