Client output should be cleaner