Some commenting done