FIX/STY: addressing @agramfort 's comments