changed arrays to 5.4 style except in function declarations