minimized structural and variable name differences