Addressed @mblondel's comments