some cleanup in the comments