cleanup - renamed functions