Cleaned up debugger