Addressed @romainneutron comments