remove System.out lines, cosmetic improvements