fix replacements for default values, reformatting