Add comments to indicate why it is necessary to change the font for certain lines + clean-up