improved the mechanism - better cleaner