Cleans up the code changes from the prior commit to fit the style
guidelines better.