A bit of cleanup with the comments