Small refactoring, syncing up.