Improving/reformatting coding standard.
Renaming some stuff to make code easier to read/understand.