Refactor
Remove debug output