Explanations and include guards improved.