Refactored the stripping a bit