Addressed @romainneutron's comments