Sharpening some of the code examples