More commenting done