Cleaned up some access qualifiers.