QOL debug changes

Moved debug statements to separate methods