Streamline the likelihood calculation a bit