+ shortened main() a little, and a few aesthetic cleanups here & there.
2 files changed