Refactoring comments/debug lines