more code cleanuop