Clean up call formatting