Minor edits based on Erez's comments