Clean up the pr a bit.