Maybe tidy up the comments since you're touching that part of the code?