Improvements based on code review