fixed code review issues