format, vars tidy-up