move clean to method