Cleaned up debug dups and spacing