Made output method better