less code clear up