code cleamup

code cleamup