Remove console output
Refactor