Cleaned up use of independent variables or data dictionary for file names (just the latter).
Cleaned up comments, minor re-ordering.