MAINT: Fixing improper merging during rebase. Also moving comment to new line.