Modernize the codebase