Cleaned up whitespace and made debug logging less verbose.