Code review items

Here is the code that will address the concerns you indicated in your email.