Cleaning up and perfecting Warsh source text