Add variables and naming conventions