Some more in-line documentation