Cleanup for style and shadowed variable names.