Cleanup of documentation and code