refactor stripper