minor whitespace and comment changes to accurately credit initial source