diff --git a/client.js b/client.js
index c0b4406..dbb9608 100755
--- a/client.js
+++ b/client.js
@@ -183,7 +183,8 @@ var clientID = "Cli0";
           let tag = (TEST || TRY) ? "test" : await cache(tootData, beebState);
 
           // Post a video toot
-          mastodon.videoReply(mediaFilename,mediaType,tweet.id,"@"+tweet.account.acct,tweet,checksum,hasAudio,tag);
+          await mastodon.videoReply(mediaFilename,mediaType,tweet.id,"@"+tweet.account.acct,tweet,checksum,hasAudio,tag);
+          exec('rm '+mediaFilename);
         }
 
         setTimeout(requestTweet, POLL_DELAY);
diff --git a/mastodon.js b/mastodon.js
index b2c841a..bd2c4a1 100644
--- a/mastodon.js
+++ b/mastodon.js
@@ -1,8 +1,8 @@
 
 const ENABLE_TEXT_REPLY = false;
-const log            = require('npmlog');
+const log = require('npmlog');
 log.level = process.env.LOG_LEVEL || 'verbose';
-const Mastodon  = require('mastodon');
+const Mastodon = require('mastodon');
 require('dotenv').config();
 const config = {
 	access_token: process.env.ACCESS_TOKEN,
@@ -11,78 +11,80 @@ const config = {
 };
 
 const mastodon = new Mastodon(config);
-const fs	     = require('fs');
+const fs = require('fs');
 
-function post (path, params) {
-	log.info("Post",path,params)
+function post(path, params) {
+	log.info("Post", path, params)
 }
 
-function get (path,params) {
-		log.info("get",path,params)
+function get(path, params) {
+	log.info("get", path, params)
 }
 
 
-async function videoReply(filename,mediaType,replyTo,text,toot,checksum,hasAudio,tag){
+async function videoReply(filename, mediaType, replyTo, text, toot, checksum, hasAudio, tag) {
 
-	if (toot.spoiler_text == ""){
+	if (toot.spoiler_text == "") {
 		console.log("No CW on bot source post")
 	}
 
 	try {
-
-		let resp = await mastodon.post('media', { file: fs.createReadStream(filename), description:"BBC Micro Bot graphics output - "+toot.spoiler_text });
-		log.info(resp)
+		let resp = await mastodon.post('media', { file: fs.createReadStream(filename), description: "BBC Micro Bot graphics output - " + toot.spoiler_text });
+		log.info(JSON.stringify(resp.data.id));
 		let id = resp.data.id; // Source: https://bbcmic.ro/#"+progData
-		let params = { status:"I ran "+text+"'s program and got this.\nSource: https://bbcmic.ro/?t="+tag+" #bbcbasic", media_ids: [id],in_reply_to_id:replyTo};
+		let params = { status: "I ran " + text + "'s program and got this.\nSource: https://bbcmic.ro/?t=" + tag + " #bbcbasic", media_ids: [id], in_reply_to_id: replyTo };
 		params.visibility = "public";
 
 		let response = await mastodon.post('statuses', params);
-		log.info("Media post DONE ",JSON.stringify(response));
 
-		await mastodon.post('statuses/:id/favourite', { id: [toot.id]});
-		log.info("Favourited "+toot.id);
+		log.info("Media post DONE ", JSON.stringify(response.data.id));
 
-		let user = response.in_reply_to_account_id;
+		await mastodon.post('statuses/' + response.data.in_reply_to_id + '/favourite');
+		log.info("Favourited " + toot.id);
 
-		let relationship = await mastodon.get('accounts/relationship', {id: [user]});
+		let user = response.data.in_reply_to_account_id;
+		log.info("User " + user);
+		let relationship = await mastodon.get('accounts/relationships', { id: user });
+		log.info("Relationship " + (relationship.data[0].following ? "following" : "not following"));
 
-		if (relationship[0].following) {
-			// Repost toot resp
-			log.info("Reposting toot "+response.id);
-			await mastodon.post('statuses/:id/reblog', { id: [response.id]});
+		// If we're not following the user, reblog the toot
+		if (relationship.data[0].following) {
+			log.info("Reposting toot " + response.data.id);
+			await mastodon.post('statuses/' + response.data.id + '/reblog');
 		}
-		
 
 		//return {full:"https://bbcmic.ro/"+experimental+"#"+progData,key:short_url}
-		}
-
-		catch(e) {
-			log.info("Media post FAILED");
-			log.info(e);
-			return null;
-		}
 	}
 
-	function noOutput(toot) {
-		console.warn("NO VIDEO CAPTURED");
-		if (!ENABLE_TEXT_REPLY) return;
-		try {
-			post('statuses/update', {status: "@"+toot.user.screen_name+" Sorry, no output captured from that program", in_reply_to_status_id: toot.id});
-		}
-		catch(e) {
-			log.info("Non-media post FAILED");
-			log.info(e);
-		}
+	catch (e) {
+
+		log.info("Media post FAILED");
+		log.info(e);
+		return null;
 	}
+}
 
-	function block(toot) {
-		post('blocks/create',{screen_name: toot.user.screen_name});
+
+function noOutput(toot) {
+	console.warn("NO VIDEO CAPTURED");
+	if (!ENABLE_TEXT_REPLY) return;
+	try {
+		post('statuses/update', { status: "@" + toot.user.screen_name + " Sorry, no output captured from that program", in_reply_to_status_id: toot.id });
 	}
+	catch (e) {
+		log.info("Non-media post FAILED");
+		log.info(e);
+	}
+}
 
-	module.exports = {
-		videoReply: videoReply,
-		noOutput: noOutput,
-		block: block,
-		post: post,
-		get: get
-	};
+function block(toot) {
+	post('blocks/create', { screen_name: toot.user.screen_name });
+}
+
+module.exports = {
+	videoReply: videoReply,
+	noOutput: noOutput,
+	block: block,
+	post: post,
+	get: get
+};