Style changes

I changed some variable names and added in some comments.