Changed some variable names and set line length to 120