Debug Cleanup, nicer to look at now :heart: