Remove IF conditional for Tabularize mappings

This resulted in the mappings not being mapped.
Add dynamic mapping to perform simple Tabularize aligning
Align all the comments! :)