Cleaned up the debug a bit