Incorporate Patrick's feedback, one nit from Amos