unpad array indexes and other style changes