Debug Statements and Refactoring