simplify code
Merge