Add more helper comments