fixed code review comments o/