diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 3e93a1ad61..1647bf14a9 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -6,33 +6,33 @@
  * See the COPYING-README file.
  */
 
-require_once ("../../lib/base.php");
+require_once ('../../lib/base.php');
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
-$cal = isset($_GET["calid"]) ? $_GET["calid"] : NULL;
-$event = isset($_GET["eventid"]) ? $_GET["eventid"] : NULL;
+$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
+$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
 if(isset($cal)){
 	$calendar = OC_Calendar_Calendar::findCalendar($cal);
-	if($calendar["userid"] != OC_User::getUser()){
+	if($calendar['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
 	$calobjects = OC_Calendar_Object::all($cal);
-	header("Content-Type: text/Calendar");
-	header("Content-Disposition: inline; filename=calendar.ics"); 
+	header('Content-Type: text/Calendar');
+	header('Content-Disposition: inline; filename=' . $calendar['displayname'] . '.ics'); 
 	for($i = 0;$i <= count($calobjects); $i++){
-		echo $calobjects[$i]["calendardata"] . "\n";
+		echo $calobjects[$i]['calendardata'] . '\n';
 	}
 }elseif(isset($event)){
-	$data = OC_Calendar_Object::find($_GET["eventid"]);
-	$calendarid = $data["calendarid"];
+	$data = OC_Calendar_Object::find($_GET['eventid']);
+	$calendarid = $data['calendarid'];
 	$calendar = OC_Calendar_Calendar::findCalendar($calendarid);
-	if($calendar["userid"] != OC_User::getUser()){
+	if($calendar['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
-	header("Content-Type: text/Calendar");
-	header("Content-Disposition: inline; filename=" . $data["summary"] . ".ics"); 
-	echo $data["calendardata"];
+	header('Content-Type: text/Calendar');
+	header('Content-Disposition: inline; filename=' . $data['summary'] . '.ics'); 
+	echo $data['calendardata'];
 }
 ?>
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
index 3c74d7f553..4a1e7a172d 100644
--- a/apps/contacts/export.php
+++ b/apps/contacts/export.php
@@ -9,36 +9,30 @@
 require_once ("../../lib/base.php");
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
-$book = isset($_GET["bookid"]) ? $_GET["bookid"] : NULL;
-$contact = isset($_GET["contactid"]) ? $_GET["contactid"] : NULL;
+$book = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;
+$contact = isset($_GET['contactid']) ? $_GET['contactid'] : NULL;
 if(isset($book)){
-	OC_Log::write('contacts',"book isset($book)",OC_Log::DEBUG);
 	$addressbook = OC_Contacts_Addressbook::find($book);
-	OC_Log::write('contacts',"Got addressbook",OC_Log::DEBUG);
-	OC_Log::write('contacts',"userid: {$addressbook["userid"]}",OC_Log::DEBUG);
-	if($addressbook["userid"] != OC_User::getUser()){
+	if($addressbook['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
-	OC_Log::write('contacts',"User match",OC_Log::DEBUG);
 	$cardobjects = OC_Contacts_VCard::all($book);
-	header("Content-Type: text/directory");
-	header("Content-Disposition: inline; filename=addressbook.vcf"); 
+	header('Content-Type: text/directory');
+	header('Content-Disposition: inline; filename=' . $addressbook['displayname'] . '.vcf'); 
 	for($i = 0;$i <= count($cardobjects); $i++){
-		echo $cardobjects[$i]["carddata"] . "\n";
+		echo trim($cardobjects[$i]['carddata']) . '\n';
 	}
 }elseif(isset($contact)){	
-	OC_Log::write('contacts',"contact isset($contact)",OC_Log::DEBUG);
 	$data = OC_Contacts_VCard::find($contact);
-	$addressbookid = $data["addressbookid"];
-	OC_Log::write('contacts',"addressbookid: $addressbookid",OC_Log::DEBUG);
+	$addressbookid = $data['addressbookid'];
 	$addressbook = OC_Contacts_Addressbook::find($addressbookid);
-	if($addressbook["userid"] != OC_User::getUser()){
+	if($addressbook['userid'] != OC_User::getUser()){
 		OC_JSON::error();
 		exit;
 	}
-	header("Content-Type: text/directory");
-	header("Content-Disposition: inline; filename=" . $data["fullname"] . ".vcf"); 
-	echo $data["carddata"];
+	header('Content-Type: text/directory');
+	header('Content-Disposition: inline; filename=' . $data['fullname'] . '.vcf'); 
+	echo $data['carddata'];
 }
 ?>