Formatting fixes
Using dotted notation for arrays