Converted to shorter array declaration style