Reordered methods.  Reformatted.
Command-line key argument identifiers for data and header values as val constants.
Fixed parameterless and void methods that were incorrectly declared as returning values.  Fixed other warnings.