Adding comments, cleaning things up a bit.