Improvements per code review