diff --git a/src/lib/bitstream.ts b/src/lib/generators/bitstream.ts
similarity index 100%
rename from src/lib/bitstream.ts
rename to src/lib/generators/bitstream.ts
diff --git a/src/lib/index.ts b/src/lib/generators/index.ts
similarity index 100%
rename from src/lib/index.ts
rename to src/lib/generators/index.ts
diff --git a/src/lib/rtdx/data.ts b/src/lib/generators/rtdx/data.ts
similarity index 100%
rename from src/lib/rtdx/data.ts
rename to src/lib/generators/rtdx/data.ts
diff --git a/src/lib/rtdx/generate.ts b/src/lib/generators/rtdx/generate.ts
similarity index 95%
rename from src/lib/rtdx/generate.ts
rename to src/lib/generators/rtdx/generate.ts
index 9da2f29..92cb260 100755
--- a/src/lib/rtdx/generate.ts
+++ b/src/lib/generators/rtdx/generate.ts
@@ -21,19 +21,15 @@ function shuffle(code: string[]): string[] {
  * Converts indexes to symbols
  */
 function toSymbols(indexes: number[]): string[] {
-	const code: string[] = [];
-	for (const i of indexes) {
-		code.push(symbols[i]);
-	}
-	return code;
+	return indexes.map((i) => symbols[i]);
 }
 
 /**
  * Unpacks the code
  */
-function unpack(bitstream: number[]): number[] {
+function bitunpack(bits: number[]): number[] {
 	const unpacked: number[] = [];
-	const reader = new BitstreamReader(bitstream, 8);
+	const reader = new BitstreamReader(bits, 8);
 	while (reader.remaining()) {
 		unpacked.push(reader.read(6));
 	}
@@ -109,7 +105,7 @@ function serialize(data: RescueData | RevivalData): string {
 	const indexes = writer.finish();
 	indexes.unshift(checksum(indexes));
 	const encrypted = encrypt(indexes);
-	const bitstream = unpack(encrypted);
+	const bitstream = bitunpack(encrypted);
 	const symbols = toSymbols(bitstream);
 	const code = shuffle(symbols);
 	return code.join('');
diff --git a/src/lib/rtdx/index.ts b/src/lib/generators/rtdx/index.ts
similarity index 100%
rename from src/lib/rtdx/index.ts
rename to src/lib/generators/rtdx/index.ts
diff --git a/src/lib/rtdx/read.ts b/src/lib/generators/rtdx/read.ts
similarity index 96%
rename from src/lib/rtdx/read.ts
rename to src/lib/generators/rtdx/read.ts
index 522d88a..3a47aaf 100755
--- a/src/lib/rtdx/read.ts
+++ b/src/lib/generators/rtdx/read.ts
@@ -6,7 +6,7 @@ import { Data } from './data';
  * Splits code string into array
  */
 function splitCode(code: string): string[] {
-	code = code.replace(' ', '').toLowerCase();
+	code = code.replace(/\s/g, '').toLowerCase();
 	let codeToSplit = '';
 	for (let i = 0; i < code.length; i += 2) {
 		codeToSplit += code.slice(i, i + 2) + ' ';
@@ -32,15 +32,7 @@ function unshuffle(code: string[]): string[] {
  * Converts symbols to indexes 0-63
  */
 function toIndexes(code: string[]): number[] {
-	const indexes: number[] = [];
-	for (let i = 0; i < code.length; i++) {
-		for (let j = 0; j < symbols.length; j++) {
-			if (symbols[j] === code[i]) {
-				indexes[i] = j;
-			}
-		}
-	}
-	return indexes;
+	return code.map((c) => symbols.indexOf(c));
 }
 
 /**
diff --git a/src/lib/rtdx/romdata.ts b/src/lib/generators/rtdx/romdata.ts
similarity index 100%
rename from src/lib/rtdx/romdata.ts
rename to src/lib/generators/rtdx/romdata.ts
diff --git a/src/lib/rtdx/utils.ts b/src/lib/generators/rtdx/utils.ts
similarity index 100%
rename from src/lib/rtdx/utils.ts
rename to src/lib/generators/rtdx/utils.ts
diff --git a/src/routes/(rtdx)/PasswordImage.svelte b/src/routes/(rtdx)/PasswordImage.svelte
index 7338b13..dea1663 100644
--- a/src/routes/(rtdx)/PasswordImage.svelte
+++ b/src/routes/(rtdx)/PasswordImage.svelte
@@ -42,7 +42,7 @@
 		const characters = password.toLowerCase().match(/.{1,2}/g)!;
 		for (let i = 0; i < 30; i++) {
 			const pos = i % 15;
-			const x = 71 + (pos * 54) + (Math.floor(pos / 5) * 8.5);
+			const x = 71 + pos * 54 + Math.floor(pos / 5) * 8.5;
 			const y = 71 + (i >= 15 ? 69 : 0) + (pos >= 5 && pos <= 9 ? 8.5 : 0);
 			drawCharacter(characters[i], x, y);
 		}
diff --git a/src/routes/(rtdx)/rtdx-rescue/+page.svelte b/src/routes/(rtdx)/rtdx-rescue/+page.svelte
index 1b7c608..80c7b7f 100644
--- a/src/routes/(rtdx)/rtdx-rescue/+page.svelte
+++ b/src/routes/(rtdx)/rtdx-rescue/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { base } from '$app/paths';
-	import { RTDX } from '$lib';
+	import { RTDX } from '$lib/generators';
 	import PasswordImage from '../PasswordImage.svelte';
 
 	let password: string;
diff --git a/src/routes/(rtdx)/rtdx-revival/+page.svelte b/src/routes/(rtdx)/rtdx-revival/+page.svelte
index 323256c..252ba9a 100644
--- a/src/routes/(rtdx)/rtdx-revival/+page.svelte
+++ b/src/routes/(rtdx)/rtdx-revival/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { base } from '$app/paths';
-	import { RTDX } from '$lib';
+	import { RTDX } from '$lib/generators';
 	import PasswordImage from '../PasswordImage.svelte';
 
 	let password: string;