getting rid of extra code