Adjustments to get well-formatted output