Adding some in-code comments for clarity