Code simplify v2