Better & more consistent commenting.