code cleanupp