Cleanup output formatting
Major restructuring