Cleaned up outputs slightly