Cleanup and comment removal.