Continued housekeeping, better variable names, file names and more comments.