Made more improvements on comments