Updated commenting and optional inputs.