Minor clean up and documentation improvement