Shorten declaration of empty slices
Code cleanup