Added some comments, no functionality changes