Cleaned up and reorganized output