simplify code
code cleanup
simpler code
fix exist