Added the option to tidy things