Removing more array shorthand statements