Some cleanup in the comments