Just a bit of reorganization...
You know what? Let's make that a public function!