Refactored cleaner, references