Update the code to match my current coding style.