Modernize codebase a bit

No match.