Added output formatting