Cleaner: do work in clean instead of constructor