Fixing some commented code and removing a system.out.println