Bit of clean-up, added some comments.