Fix formatting and standarize variables