Minor syntax, style edits