Array style fixes - updated to 5.4 style