Formatting, variable cleanup