Cleaned up code.

- consistent commas
- renamed some vars
- 80 char line limit