Changes made after code review