Merge "Update formatting of file backend classes"