Update files from databases in separate, format-based methods
More verbose variable names and cleanup