A little bit of clean-up and comments.