Cleanup and a few lines of documentation.