Restructuring code
Restructuring code