Minor cleanup and documentation changes