Improve comments and argument names