Refactor master cleaner so it doesn't do the same work over and over.