Some more polishing to address review comments.