Refactoring: Remove all system.out.println