some minor functional edits

let me know if these are kosher
"for when" sounds weird. I always side on using simpler language whenever possible