Some style updates:
Added explicitly "private:" to classes where it was missing,
Corrected indentation and line breaks,
Updated private member variable names (more to come)