Switched the array style.  Much cleaner!