Learned to align using vim-easy-align and started doing this.

Fixed the mapping/topology and some of the redistribution functions to be type-oblivious