Restructuring: Change how functions are defined