Improve readability, and simplify code

just cosmetic, it is easier to read, and no extra code