Add some clarifying comments.
Some streamlining of code.