Cleaned up a little of the debugging