simplify following code review