Updated commenting

Updated the commenting to make it clearer which comments went with
which function.