Changes made from code review