Style tweaks & updates to array syntax