Modernizations and cleanup.