cleanup and improve legibility