Modernize

These modernizations took place while working on a client project.