Final cleanup of method names and documentation.