code clear up