C style array declarations -> D style
align code neatly again