Add token value directly to column
:lipstick: Use trailing for loop
Update specs where tab is now only 1 space