Minor renaming
Pushing debug lines to super class