Review fixes. Simpler