diff --git a/Makefile b/Makefile
index 0262d0a..b0ad1b0 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,10 @@ $(EXECUTABLE): $(OBJECTS)
 	@$(CC) $(CCFLAGS) $(DBFLAGS) -c $< -o $@
 
 clean:
-	rm -rf $(OBJECTS) $(EXECUTABLE)
+	rm -f $(OBJECTS) $(EXECUTABLE)
 
 distclean:
-	rm -rf $(OBJECTS)
+	rm -f $(OBJECTS)
 
 install:
 	install -m755 -D $(EXECUTABLE) "$(INSTALLDIR)/$(EXECUTABLE)"
diff --git a/agent/Makefile b/agent/Makefile
index 3cbfa29..d224648 100644
--- a/agent/Makefile
+++ b/agent/Makefile
@@ -32,8 +32,8 @@ debug:	$(SOURCES) $(EXECUTABLE)
 	@echo ' Compiling debug with $(CCFLAGS)'
 
 clean:
-	rm -rf $(OBJECTS) $(EXECUTABLE)
+	rm -f $(OBJECTS) $(EXECUTABLE)
 
 distclean:
-	rm -rf $(OBJECTS)
+	rm -f $(OBJECTS)
 
diff --git a/job_queue.c b/job_queue.c
index e3e136a..2a8f467 100644
--- a/job_queue.c
+++ b/job_queue.c
@@ -9,6 +9,7 @@ int total_queues;
 int start_msg_queue(void)
 {
 	int i;
+
 	for (i = 0; i < total_queues; i++) {
 		if (slot[i] == NULL) {
 			slot[i] = (struct msg_t *)calloc(100, sizeof(struct msg_t));
@@ -31,12 +32,13 @@ int start_job_queue(int poolsize)
 	if (slot == NULL)
 		return -1;
 	total_queues = poolsize;
-	return 0;	
+	return 0;
 }
 
 int add_msg_to_queue(int id, struct msg_t buf)
 {
 	int i;
+
 	for (i = 0; i < 100; i++) {
 		if (slot[id][i].meta.is_recv) {
 			memcpy(&slot[id][i], &buf, sizeof(struct msg_t));