cleanup and pretty