Scrub refactor