Change slice pointers to slices
Rename some vars