Restructured Code for Debugging

No use.