updating variable names and adjusting spacing