Use clean method instead of a flag