Removing usage of short array notation