diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index b0095ead05..77693417df 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -80,7 +80,7 @@
 		else
 			handle_click_empty(user)
 		return 0
-	return 1
+	return 1
 
 /obj/item/weapon/gun/emp_act(severity)
 	for(var/obj/O in contents)
@@ -112,7 +112,7 @@
 	else if(user.a_intent == I_HURT) //point blank shooting
 		Fire(A, user, pointblank=1)
 	else
-		return ..() //Pistolwhippin'
+		return ..() //Pistolwhippin'
 
 /obj/item/weapon/gun/proc/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0)
 	if(!user || !target) return
@@ -170,14 +170,14 @@
 		
 		if(reflex)
 			user.visible_message(
-				"<span class='reflex_shoot'><b>[user] fires [src][pointblank ? "  point blank at [target]":""] by reflex!<b></span>",
-				"<span class='reflex_shoot'>You fire [src] by reflex]!</span>",
+				"<span class='reflex_shoot'><b>\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""] by reflex!<b></span>",
+				"<span class='reflex_shoot'>You fire \the [src] by reflex!</span>",
 				"You hear a [fire_sound_text]!"
 			)
 		else
 			user.visible_message(
-				"<span class='danger'>[user] fires [src][pointblank ? "  point blank at [target]":""]!</span>",
-				"<span class='warning'>You fire [src]!</span>",
+				"<span class='danger'>\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""]!</span>",
+				"<span class='warning'>You fire \the [src]!</span>",
 				"You hear a [fire_sound_text]!"
 				)
 	
@@ -193,7 +193,7 @@
 	
 	var/obj/item/projectile/P = projectile
 	
-	//shooting while in shock
+	//shooting while in shock
 	var/x_offset = 0
 	var/y_offset = 0
 	if(istype(user, /mob/living/carbon))
@@ -266,7 +266,7 @@
 	else
 		handle_click_empty(user)
 		mouthshoot = 0
-		return
+		return
 
 /obj/item/weapon/gun/proc/toggle_scope(var/zoom_amount=2.0)
 	//looking through a scope limits your periphereal vision