Minor improvements on comments and documentation