Review changes for #249