moved distance categorisation to the cleaner