Formatting and variable name changed