Improvements from code review