Made code self documenting