@xiangli-cmu I know this comment isn't part of the diff of this PR but, in general, don't include line numbers in the source code since those line numbers will change as new code gets merged in.