trafassel Code reformatting and renaming some member variables.

Latest commit 2b6e7e2

Dec 19, 2015