Addressed @romainneutron's comments

Fixes