Addressed @nlegoff comments