Code sample, other edits