Cleanup and corrected Hooks regression