Tweak whitespace (ugh) and include full source in main