part two of great cleanup: tabular fix

Signed-off-by: Andrei Thorp <athorp@evernote.com>