More commenting. Clean up