rev rephract to the post-rename clean version
fix style nit