clean up
more compact format