removed unused var "Short_name"