reordered members of main class