After review improvments