Review fixes. Less code, cleaner path