Cleaner architecture