Change some variable names so they are clearer
Code formatting