Fix array initializations

Remove unneeded alignment and indent correctly. Remove a few additional empty lines along the way.