removed excess lines and debugging System.out statements