MRG: array name fix and whitespace cleanups

Fix for array names for alignment checks.

Fix trailing whitespace.