Fixup: Updated comments