Improve in-line documentation