cleaned up some extra code