cleanup and prettify