code cleanuup