Final cleanup and comments