Minor cleanup, output formatting, call run() instead.