fix ordering of values in cleaner