Formatting and variable renaming