Formatted output and added some javadoc comments.  Only task left is to
properly read input and finish commenting