diff --git a/index.js b/index.js
index 1271869..c228dca 100644
--- a/index.js
+++ b/index.js
@@ -3,16 +3,16 @@
 
 const fs = require('node:fs');
 const chokidar = require('chokidar');
-const isLocalIP = require('./scripts/utils/isLocalIP.js');
-const parseTimestamp = require('./scripts/utils/parseTimestamp.js');
-const log = require('./scripts/utils/log.js');
 const axios = require('./scripts/services/axios.js');
 const { saveBufferToFile, loadBufferFromFile, sendBulkReport, BULK_REPORT_BUFFER } = require('./scripts/services/bulk.js');
 const { reportedIPs, loadReportedIPs, saveReportedIPs, isIPReportedRecently, markIPAsReported } = require('./scripts/services/cache.js');
 const { refreshServerIPs, getServerIPs } = require('./scripts/services/ipFetcher.js');
+const { version, repoName, repoURL } = require('./scripts/utils/repo.js');
 const sendWebhook = require('./scripts/services/discordWebhooks.js');
+const isLocalIP = require('./scripts/utils/isLocalIP.js');
+const { parseNumber, parseTimestamp } = require('./scripts/utils/parse.js');
+const log = require('./scripts/utils/log.js');
 const config = require('./config.js');
-const { version } = require('./package.json');
 const { UFW_LOG_FILE, ABUSEIPDB_API_KEY, SERVER_ID, AUTO_UPDATE_ENABLED, AUTO_UPDATE_SCHEDULE, DISCORD_WEBHOOKS_ENABLED, DISCORD_WEBHOOKS_URL } = config.MAIN;
 
 const ABUSE_STATE = { isLimited: false, isBuffering: false, sentBulk: false };
@@ -26,7 +26,7 @@ const nextRateLimitReset = () => {
 
 let LAST_RATELIMIT_LOG = 0, LAST_STATS_LOG = 0, RATELIMIT_RESET = nextRateLimitReset(), fileOffset = 0;
 
-const checkRateLimit = () => {
+const checkRateLimit = async () => {
 	const now = Date.now();
 	if (now - LAST_STATS_LOG >= BUFFER_STATS_INTERVAL && BULK_REPORT_BUFFER.size > 0) LAST_STATS_LOG = now;
 
@@ -34,33 +34,31 @@ const checkRateLimit = () => {
 		if (now >= RATELIMIT_RESET.getTime()) {
 			ABUSE_STATE.isLimited = false;
 			ABUSE_STATE.isBuffering = false;
-			if (!ABUSE_STATE.sentBulk && BULK_REPORT_BUFFER.size > 0) sendBulkReport();
+			if (!ABUSE_STATE.sentBulk && BULK_REPORT_BUFFER.size > 0) await sendBulkReport();
 			RATELIMIT_RESET = nextRateLimitReset();
 			ABUSE_STATE.sentBulk = false;
-
-			log(0, `Rate limit reset. Next reset scheduled at ${RATELIMIT_RESET.toISOString()}`, 1);
+			log(`Rate limit reset. Next reset scheduled at ${RATELIMIT_RESET.toISOString()}`, 1);
 		} else if (now - LAST_RATELIMIT_LOG >= RATE_LIMIT_LOG_INTERVAL) {
 			const minutesLeft = Math.ceil((RATELIMIT_RESET.getTime() - now) / 60000);
-			log(0, `Rate limit is still active. Collected ${BULK_REPORT_BUFFER.size} IPs. Waiting for reset in ${minutesLeft} minute(s) (${RATELIMIT_RESET.toISOString()})`, 1);
+			log(`Rate limit is still active. Collected ${BULK_REPORT_BUFFER.size} IPs. Waiting for reset in ${minutesLeft} minute(s) (${RATELIMIT_RESET.toISOString()})`, 1);
 			LAST_RATELIMIT_LOG = now;
 		}
 	}
 };
 
 const reportIp = async ({ srcIp, dpt = 'N/A', proto = 'N/A', id, timestamp }, categories, comment) => {
-	if (!srcIp) return log(2, ' Missing source IP (srcIp)', 1);
+	if (!srcIp) return log('Missing source IP (srcIp)', 3);
 
 	if (getServerIPs().includes(srcIp)) return;
 	if (isIPReportedRecently(srcIp)) return;
 
-	checkRateLimit();
+	await checkRateLimit();
 
 	if (ABUSE_STATE.isBuffering) {
 		if (BULK_REPORT_BUFFER.has(srcIp)) return;
-
-		BULK_REPORT_BUFFER.set(srcIp, { timestamp, categories, comment });
+		BULK_REPORT_BUFFER.set(srcIp, { categories, timestamp, comment });
 		saveBufferToFile();
-		log(0, `Queued ${srcIp} for bulk report (collected ${BULK_REPORT_BUFFER.size} IPs)`);
+		log(`Queued ${srcIp} for bulk report (collected ${BULK_REPORT_BUFFER.size} IPs)`, 1);
 		return;
 	}
 
@@ -71,110 +69,82 @@ const reportIp = async ({ srcIp, dpt = 'N/A', proto = 'N/A', id, timestamp }, ca
 			comment,
 		}), { headers: { 'Key': ABUSEIPDB_API_KEY } });
 
-		log(0, `Reported ${srcIp} [${dpt}/${proto}]; ID: ${id}; Categories: ${categories}; Abuse: ${res.data.abuseConfidenceScore}%`);
+		log(`Reported ${srcIp} [${dpt}/${proto}]; ID: ${id}; Categories: ${categories}; Abuse: ${res.data.abuseConfidenceScore}%`, 1);
 		return true;
 	} catch (err) {
-		if (err.response?.status === 429 && JSON.stringify(err.response?.data || {}).includes('Daily rate limit')) {
+		const status = err.response?.status ?? 'unknown';
+		if (status === 429 && JSON.stringify(err.response?.data || {}).includes('Daily rate limit')) {
 			if (!ABUSE_STATE.isLimited) {
 				ABUSE_STATE.isLimited = true;
 				ABUSE_STATE.isBuffering = true;
 				ABUSE_STATE.sentBulk = false;
 				LAST_RATELIMIT_LOG = Date.now();
 				RATELIMIT_RESET = nextRateLimitReset();
-				log(0, `Daily AbuseIPDB limit reached. Buffering reports until ${RATELIMIT_RESET.toISOString()}`, 1);
+				log(`Daily AbuseIPDB limit reached. Buffering reports until ${RATELIMIT_RESET.toISOString()}`, 2);
 			}
 
-			if (BULK_REPORT_BUFFER.has(srcIp)) {
-				log(0, `${srcIp} is already in buffer, skipping`);
-				return;
+			if (!BULK_REPORT_BUFFER.has(srcIp)) {
+				BULK_REPORT_BUFFER.set(srcIp, { timestamp, categories, comment });
+				saveBufferToFile();
+				log(`Queued ${srcIp} for bulk report due to rate limit`, 2);
 			}
-
-			BULK_REPORT_BUFFER.set(srcIp, { timestamp, categories, comment });
-			saveBufferToFile();
-
-			log(0, `Queued ${srcIp} for bulk report due to rate limit`);
 		} else {
-			const status = err.response?.status ?? 'unknown';
-			log(
-				status === 429 ? 0 : 2,
-				`Failed to report ${srcIp} [${dpt}/${proto}];\n${err.response?.data?.errors ? JSON.stringify(err.response.data.errors) : err.message}`,
-				status === 429 ? 0 : 1
-			);
+			log(`Failed to report ${srcIp} [${dpt}/${proto}]; ${err.response?.data?.errors ? JSON.stringify(err.response.data.errors) : err.message}`, status === 429 ? 2 : 3);
 		}
 	}
 };
 
-const toNumber = (str, regex) => {
-	const parsed = str.match(regex)?.[1];
-	return parsed ? Number(parsed) : parsed;
-};
-
 const processLogLine = async (line, test = false) => {
-	if (!line.includes('[UFW BLOCK]')) return log(1, `Ignoring invalid line: ${line}`, 1);
+	if (!line.includes('[UFW BLOCK]')) return log(`Ignoring invalid line: ${line}`, 2);
 
 	const data = {
-		timestamp: parseTimestamp(line), // Log timestamp
-		srcIp: line.match(/SRC=([\d.]+)/)?.[1] || null, // Source IP address
-		dstIp: line.match(/DST=([\d.]+)/)?.[1] || null, // Destination IP address
-		proto: line.match(/PROTO=(\S+)/)?.[1] || null, // Protocol (TCP, UDP, etc.)
-		spt: toNumber(line, /SPT=(\d+)/), // Source port
-		dpt: toNumber(line, /DPT=(\d+)/), // Destination port
-		in: line.match(/IN=(\w+)/)?.[1] || null, // Input interface
-		out: line.match(/OUT=(\w+)/)?.[1] || null, // Output interface
-		mac: line.match(/MAC=([\w:]+)/)?.[1] || null, // MAC address
-		len: toNumber(line, /LEN=(\d+)/), // Packet length
-		ttl: toNumber(line, /TTL=(\d+)/), // Time to live
-		id: toNumber(line, /ID=(\d+)/), // Packet ID
-		tos: line.match(/TOS=(\S+)/)?.[1] || null, // Type of service
-		prec: line.match(/PREC=(\S+)/)?.[1] || null, // Precedence
-		res: line.match(/RES=(\S+)/)?.[1] || null, // Reserved bits
-		window: toNumber(line, /WINDOW=(\d+)/), // TCP Window size
-		urgp: toNumber(line, /URGP=(\d+)/), // Urgent pointer
-		ack: !!line.includes('ACK'), // ACK flag
-		syn: !!line.includes('SYN'), // SYN flag
+		timestamp: parseTimestamp(line),
+		srcIp: line.match(/SRC=([\d.]+)/)?.[1] || null,
+		dstIp: line.match(/DST=([\d.]+)/)?.[1] || null,
+		proto: line.match(/PROTO=(\S+)/)?.[1] || null,
+		spt: parseNumber(line, /SPT=(\d+)/),
+		dpt: parseNumber(line, /DPT=(\d+)/),
+		in: line.match(/IN=(\w+)/)?.[1] || null,
+		out: line.match(/OUT=(\w+)/)?.[1] || null,
+		mac: line.match(/MAC=([\w:]+)/)?.[1] || null,
+		len: parseNumber(line, /LEN=(\d+)/),
+		ttl: parseNumber(line, /TTL=(\d+)/),
+		id: parseNumber(line, /ID=(\d+)/),
+		tos: line.match(/TOS=(\S+)/)?.[1] || null,
+		prec: line.match(/PREC=(\S+)/)?.[1] || null,
+		res: line.match(/RES=(\S+)/)?.[1] || null,
+		window: parseNumber(line, /WINDOW=(\d+)/),
+		urgp: parseNumber(line, /URGP=(\d+)/),
+		ack: !!line.includes('ACK'),
+		syn: !!line.includes('SYN'),
 	};
 
 	const { srcIp, proto, dpt } = data;
-	if (!srcIp) return log(2, `Missing SRC in the log line: ${line}`, 1);
+	if (!srcIp) return log(`Missing SRC in the log line: ${line}`, 3);
 
 	const ips = getServerIPs();
-	if (!Array.isArray(ips)) return log(2, 'For some reason, \'ips\' is not an array', 1);
+	if (!Array.isArray(ips)) return log('For some reason, `ips` from `getServerIPs()` is not an array', 3);
 
-	if (ips.includes(srcIp)) {
-		return log(0, `Ignoring own IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1);
-	}
+	if (ips.includes(srcIp)) return log(`Ignoring own IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1);
+	if (isLocalIP(srcIp)) return log(`Ignoring local IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1);
+	if (proto === 'UDP') return log(`Skipping UDP traffic: SRC=${srcIp} DPT=${dpt}`, 1);
 
-	if (isLocalIP(srcIp)) {
-		return log(0, `Ignoring local IP address! PROTO=${proto?.toLowerCase()} SRC=${srcIp} DPT=${dpt} ID=${data.id}`, 1);
-	}
-
-	// Report MUST NOT be of an attack where the source address is likely spoofed i.e. SYN floods and UDP floods.
-	// TCP connections can only be reported if they complete the three-way handshake. UDP connections cannot be reported.
-	// Read more: https://www.abuseipdb.com/reporting-policy
-	if (proto === 'UDP') {
-		return log(0, `Skipping UDP traffic: SRC=${srcIp} DPT=${dpt}`);
-	}
-
-	// Tests
 	if (test) return data;
 
 	if (isIPReportedRecently(srcIp)) {
 		const lastReportedTime = reportedIPs.get(srcIp);
 		const elapsedTime = Math.floor(Date.now() / 1000 - lastReportedTime);
-
 		const days = Math.floor(elapsedTime / 86400);
 		const hours = Math.floor((elapsedTime % 86400) / 3600);
 		const minutes = Math.floor((elapsedTime % 3600) / 60);
 		const seconds = elapsedTime % 60;
-
 		const timeAgo = [
 			days && `${days}d`,
 			hours && `${hours}h`,
 			minutes && `${minutes}m`,
-			(seconds || !days && !hours && !minutes) && `${seconds}s`,
+			(seconds || (!days && !hours && !minutes)) && `${seconds}s`,
 		].filter(Boolean).join(' ');
-
-		log(0, `${srcIp} was last reported on ${new Date(lastReportedTime * 1000).toLocaleString()} (${timeAgo} ago)`);
+		log(`${srcIp} was last reported on ${new Date(lastReportedTime * 1000).toLocaleString()} (${timeAgo} ago)`, 1);
 		return;
 	}
 
@@ -188,22 +158,22 @@ const processLogLine = async (line, test = false) => {
 };
 
 (async () => {
-	log(0, `Version ${version} - https://github.com/sefinek/UFW-AbuseIPDB-Reporter`);
+	log(`Version ${version} - ${repoURL}`);
 
 	loadReportedIPs();
 	loadBufferFromFile();
 
 	if (BULK_REPORT_BUFFER.size > 0 && !ABUSE_STATE.isLimited) {
-		log(0, `Found ${BULK_REPORT_BUFFER.size} IPs in buffer after restart. Sending bulk report...`);
+		log(`Found ${BULK_REPORT_BUFFER.size} IPs in buffer after restart. Sending bulk report...`, 1);
 		await sendBulkReport();
 	}
 
-	log(0, 'Trying to fetch your IPv4 and IPv6 address from api.sefinek.net...');
+	log('Trying to fetch your IPv4 and IPv6 address from api.sefinek.net...');
 	await refreshServerIPs();
-	log(0, `Fetched ${getServerIPs()?.length} of your IP addresses. If any of them accidentally appear in the UFW logs, they will be ignored.`);
+	log(`Fetched ${getServerIPs()?.length} of your IP addresses. If any of them accidentally appear in the UFW logs, they will be ignored.`, 1);
 
 	if (!fs.existsSync(UFW_LOG_FILE)) {
-		log(2, `Log file ${UFW_LOG_FILE} does not exist`);
+		log(`Log file ${UFW_LOG_FILE} does not exist`, 3);
 		return;
 	}
 
@@ -214,26 +184,26 @@ const processLogLine = async (line, test = false) => {
 			const stats = fs.statSync(path);
 			if (stats.size < fileOffset) {
 				fileOffset = 0;
-				log(1, 'The file has been truncated, and the offset has been reset', 1);
+				log('The file has been truncated, and the offset has been reset', 2);
 			}
 
-			fs.createReadStream(path, { start: fileOffset, encoding: 'utf8' }).on('data', chunk => {
-				chunk.split('\n').filter(line => line.trim()).forEach(processLogLine);
-			}).on('end', () => {
-				fileOffset = stats.size;
-			});
+			fs.createReadStream(path, { start: fileOffset, encoding: 'utf8' })
+				.on('data', chunk => {
+					chunk.split('\n').filter(line => line.trim()).forEach(processLogLine);
+				})
+				.on('end', () => {
+					fileOffset = stats.size;
+				});
 		});
 
-	// Auto updates
 	if (AUTO_UPDATE_ENABLED && AUTO_UPDATE_SCHEDULE && SERVER_ID !== 'development') await require('./scripts/services/updates.js')();
 	if (DISCORD_WEBHOOKS_ENABLED && DISCORD_WEBHOOKS_URL) await require('./scripts/services/summaries.js')();
 
-	// Final
 	if (SERVER_ID !== 'development') {
-		await sendWebhook(0, `[UFW-AbuseIPDB-Reporter](https://github.com/sefinek/UFW-AbuseIPDB-Reporter) has been successfully launched on the device \`${SERVER_ID}\`.`);
+		await sendWebhook(0, `[${repoName}](${repoURL}) has been successfully launched on the device \`${SERVER_ID}\`.`);
 	}
 
-	log(0, `Ready! Now monitoring: ${UFW_LOG_FILE}`);
+	log(`Ready! Now monitoring: ${UFW_LOG_FILE}`, 1);
 	process.send && process.send('ready');
 })();
 
diff --git a/package-lock.json b/package-lock.json
index a66f248..ca3aecc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ufw-abuseipdb-reporter",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ufw-abuseipdb-reporter",
-      "version": "0.3.2",
+      "version": "0.4.0",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^1.9.0",
diff --git a/package.json b/package.json
index 79332c1..d10a8fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ufw-abuseipdb-reporter",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "A tool (with a simple installer) that monitors UFW firewall logs in real time and reports IP addresses to the AbuseIPDB database.",
   "homepage": "https://github.com/sefinek/UFW-AbuseIPDB-Reporter#readme",
   "bugs": {
diff --git a/scripts b/scripts
index 8f80ed3..a9c5111 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 8f80ed31f8edb66436c1babb9ce8459d1c34492c
+Subproject commit a9c5111d5a08de228a5bab9fc665f19b076cf23f