Code style cleanup.
Actually use the fieldset that's defined.
Unique array key.
Spacing.
Merge pull request #377 from jordandukart/7.x-fixes

Fix a collding array key, code style.