Refactor slice calls