last last last scrubber refactor (hopefully)