fixed issues resulting from code review