Further streamline the likelihood calculation