Minor formatting changes, validated