Can we change both of these to use `.format` with descriptive variable names rather than `%s`