Includes changes from code review