Address Timo's concerns about code.
Add some commentary.