Code cleanup
Code cleanup (removed unnecessary ifs).
Minor code fixup.
Minor code cleanup.
Minor code cleanup
Drop leading punctuation in note in a note reference.

This way the note begins 'p. 30' not ', p. 30'.