Fixed private function and comments