Cleanup debug
Cleanup and make code easier