Cleaned up likelihood