Restructuring passing arguments