Modernizing, cleaning up

No intentional functional changes.