Minor improvements on comments