Restructuring the code without changing functionally