MAINT move comment to the appropriate place