Cleaned up coding style and some warnings.
Cleaned up unneeded access specifiers.