Fixes review feedback