Code edit - renamed helpers