Working again, and cleaner