Change code to make a clean output