Re-organize private function ordering