diff --git a/main.c b/main.c
index 9cc0456..c2bf2f8 100644
--- a/main.c
+++ b/main.c
@@ -26,25 +26,19 @@ int main(int argc, char* argv[]) {
 	fclose(input);
 
 	// translating
-	int asmind = 0;
-	struct asmln** asmlns = translate(lns, lncount, &asmind);
+	int asmcount = 0;
+	struct asmln** asmlns = translate(lns, lncount, &asmcount);
+
+	// freeing lns
+	freelns(lns, lncount);
 	
 	// printing
-	for(int i = 0; i < asmind; i++) {
+	for(int i = 0; i < asmcount; i++) {
 		printf("%s\n", asmlns[i]->instr);
 	}
-	/*
-	for(int i = 0; i < lncount; i++) {
-		int tkcount = lns[i]->tokenscount;
-		for(int j = 0; j < tkcount; j++) {
-			printf("%s ", lns[i]->tokens[j]);
-		}
-		printf("\n");
-	}
-	*/
 
-	// freeing
-	freelns(lns, lncount);
+	// freeing asmlns
+	freeasmlns(asmlns, asmcount);
 
 	return 0;
 }
diff --git a/translator.c b/translator.c
index 4f8ff48..2d713e2 100644
--- a/translator.c
+++ b/translator.c
@@ -16,6 +16,14 @@ enum operation getop(struct line* ln) {
 	exit(1);
 }
 
+void freeasmlns(struct asmln** lns, int count) {
+	for(int i = 0; i < count; i++) {
+		free(lns[i]->instr);
+		free(lns[i]);
+	}
+	free(lns);
+}
+
 char* heapstr(const char* input) {
 	char* newstr = (char*)malloc(sizeof(char)*(strlen(input)+1));
 	strcpy(newstr, input);
@@ -59,11 +67,10 @@ char* mkind(char* ind, int indsz) {
 	return newind;
 }
 
-void checkasmsize(int* size, struct asmln** lns, int targ) {
+void checkasmsize(int* size, struct asmln*** lns, int targ) {
 	if(targ >= (*size)) {
-		printf("realloc'd");
 		(*size)=targ*2;
-		(*lns) = realloc((*lns), (*size));
+		(*lns) = (struct asmln**)realloc((*lns), (*size));
 	}
 }
 
@@ -74,31 +81,44 @@ struct asmln* mkasmln(struct line* ln, char* content) {
 	return newln;
 }
 
-void startpoppush(struct line* ln, struct asmln** asmlns, int* asmind) {
+void checkopamnt(int amnt, struct line* ln) {
+	if(ln->tokenscount < 2) {
+		fprintf(stderr, "Missing memory segment; line %i", ln->truen);
+		exit(1);
+	}
+	if(amnt > 2)
+		if(ln->tokenscount < 3) {
+			fprintf(stderr, "Missing operation index; line %i", ln->truen);
+			exit(1);
+		}
+}
+
+void startpoppush(struct line* ln, struct asmln*** asmlns, int* asmind) {
+	checkopamnt(3, ln);
 	int asmi = *asmind;
 
-	// //operation segment i
+	// // operation segment i
 	int indlen = strlen(ln->tokens[2]);
-	asmlns[asmi] = mkasmln(ln, mkcom(ln, indlen));
+	(*asmlns)[asmi] = mkasmln(ln, mkcom(ln, indlen));
 	asmi++;
 	
 	// @segment
-	asmlns[asmi] = mkasmln(ln, switchseg(ln));
+	(*asmlns)[asmi] = mkasmln(ln, switchseg(ln));
 	asmi++;
 	
 	// D=M
-	asmlns[asmi] = mkasmln(ln, heapstr("D=M"));
+	(*asmlns)[asmi] = mkasmln(ln, heapstr("D=M"));
 	asmi++;
 
 	// @i
 	checkind(ln, indlen);
-	asmlns[asmi] = mkasmln(ln, mkind(ln->tokens[2], indlen));
+	(*asmlns)[asmi] = mkasmln(ln, mkind(ln->tokens[2], indlen));
 	asmi++;
 
 	(*asmind) = asmi;
 }
 
-void mkpush(struct line* ln, struct asmln** asmlns, int* asmind, int* asmsize) {
+void mkpush(struct line* ln, struct asmln*** asmlns, int* asmind, int* asmsize) {
 	int asmi = *asmind;
 	int totalinstrs = 11;
 	checkasmsize(asmsize, asmlns, sizeof(struct asmln*)*(asmi+totalinstrs));
@@ -117,14 +137,14 @@ void mkpush(struct line* ln, struct asmln** asmlns, int* asmind, int* asmsize) {
 	};
 
 	for(int i = 0; i < instcount; i++) {
-		asmlns[asmi] = mkasmln(ln, heapstr(instrs[i]));
+		(*asmlns)[asmi] = mkasmln(ln, heapstr(instrs[i]));
 		asmi++;
 	}
 
 	(*asmind) = asmi;
 }
 
-void mkpop(struct line* ln, struct asmln** asmlns, int* asmind, int* asmsize) {
+void mkpop(struct line* ln, struct asmln*** asmlns, int* asmind, int* asmsize) {
 	int asmi = *asmind;
 	int finalasmi = 14;
 	checkasmsize(asmsize, asmlns, sizeof(struct asmln*)*(asmi+finalasmi));
@@ -146,45 +166,31 @@ void mkpop(struct line* ln, struct asmln** asmlns, int* asmind, int* asmsize) {
 	};
 
 	for(int i = 0; i < instcount; i++) {
-		asmlns[asmi] = mkasmln(ln, heapstr(instrs[i]));
+		(*asmlns)[asmi] = mkasmln(ln, heapstr(instrs[i]));
 		asmi++;
 	}
 
 	(*asmind) = asmi;
 }
 
-void mkpoppush(struct line* ln, struct asmln** asmlns, int* asmind, int* asmsize, enum operation op) {
+void switchop(struct line* ln, struct asmln*** asmlns, int* asmind, int* asmsize, enum operation op) {
 	if(op == push)
 		mkpush(ln, asmlns, asmind, asmsize);
 	else if(op == pop)
 		mkpop(ln, asmlns, asmind, asmsize);
 }
 
-void checkopamnt(struct line* ln) {
-	if(ln->tokenscount < 2) {
-		fprintf(stderr, "Missing memory segment; line %i", ln->truen);
-		exit(1);
-	}
-	if(ln->tokenscount < 3) {
-		fprintf(stderr, "Missing operation index; line %i", ln->truen);
-		exit(1);
-	}
-}
-
-struct asmln** translate(struct line** lns, int lnscount, int* asmind) {
+struct asmln** translate(struct line** lns, int lnscount, int* asmcount) {
 	int sizebet = sizeof(struct asmln*)*(lnscount * 15);
-	int asmi = (*asmind);
+	int asmi = (*asmcount);
 	struct asmln** asmlns = (struct asmln**)malloc(sizebet);
 	
 	for(int i = 0; i < lnscount; i++) {
 		struct line* ln = lns[i];
 		enum operation op = getop(ln);
-		if(op == pop || op == push) {
-			checkopamnt(ln);
-			mkpoppush(ln, asmlns, &asmi, &sizebet, op);
-		}
+		switchop(ln, &asmlns, &asmi, &sizebet, op);
 	}
 
-	(*asmind) = asmi;
+	(*asmcount) = asmi;
 	return asmlns;
 }
diff --git a/translator.h b/translator.h
index 62832c5..f3c9b43 100644
--- a/translator.h
+++ b/translator.h
@@ -6,5 +6,6 @@ struct asmln {
 	int truen;
 };
 
-struct asmln** translate(struct line** lns, int lnscount, int* asmind);
+void freeasmlns(struct asmln** lns, int count);
+struct asmln** translate(struct line** lns, int lnscount, int* asmcount);
 #endif