Cleaned up output, indents, etc.