clean-up (comments and System.out)