-Restructuring the code