(maint) Break up a long line and trim empty lines.
(maint) Cleanup an unused variable and an unintended array assignment
Merge pull request #545 from kylog/maint/fix-a-long-line

(maint) Break up a long line and trim empty lines.
Merge pull request #544 from kylog/maint/cleanup-unused-variable

(maint) Cleanup an unused variable and an unintended array assignment