Cleanup output, implement summary