some minor functional edits

let me know if these are kosher
i've seen it done both ways.