Refactor slice calls

Several calls to slice have been avoided in all/many cases