Improve variable names in connection drawing