Add comments, re-indent.