Update private, "internal" and public members to meet conventions.

Comments to separate each section (private, "internal", public).

A single var declaration for all simple private class variables.