code cleamup