Eliminated use of System.out.
Organized some methods/classes.