Cleanup of class members.
Make datatype a required program parameter.
Minor cleanup.
Better default option values.