Make format better