Final cleanup and commenting