Less hacky code

Merged PR1 from @larrrox which improved my comments with more detail, and added a much cleaner way to loop thru the array using the reorderMatrix.

Thanks @larrrox !