Make comment flow better and easier to read