Reformat code and reorder methods according to visibility. Reduce type and method visibility where applicable. See #2680 Original pull request: #2682.
Reformat code and reorder methods according to visibility. Reduce type and method visibility where applicable. See #2680 Original pull request: #2682.