More modernization of the code.