Added cleaner method