Cleanup of code, output formatting, and indentation.
2 files changed