Addressing @dengemann and @agramfort's comments