improvements on comments