Added variable and formatting