Addressed @jpountz feedback