diff --git a/gen_7_scripts/src/moves/assurance.rs b/gen_7_scripts/src/moves/assurance.rs
index 26c11b8..4377a34 100755
--- a/gen_7_scripts/src/moves/assurance.rs
+++ b/gen_7_scripts/src/moves/assurance.rs
@@ -98,7 +98,7 @@ impl Script for AssuranceData {
         _old_health: u32,
         _new_health: u32,
     ) {
-        if pokemon.battle_side_index() == self.for_position {
+        if pokemon.battle_index() == self.for_position {
             self.has_hit.store(true, Ordering::Relaxed);
         }
     }
diff --git a/pkmn_lib_interface/src/lib.rs b/pkmn_lib_interface/src/lib.rs
index 31fee07..bb0a3a9 100755
--- a/pkmn_lib_interface/src/lib.rs
+++ b/pkmn_lib_interface/src/lib.rs
@@ -74,9 +74,9 @@ macro_rules! exported_functions {
     };
 }
 
-static mut script_ptr_cache: Option<hashbrown::HashMap<*const dyn Script, u32>> = None;
-static mut script_ptr_reverse_cache: Option<hashbrown::HashMap<u32, Box<dyn Script>>> = None;
-static mut script_index_counter: AtomicU32 = AtomicU32::new(1);
+static mut SCRIPT_PTR_CACHE: Option<hashbrown::HashMap<*const dyn Script, u32>> = None;
+static mut SCRIPT_PTR_REVERSE_CACHE: Option<hashbrown::HashMap<u32, Box<dyn Script>>> = None;
+static mut SCRIPT_INDEX_COUNTER: AtomicU32 = AtomicU32::new(1);
 
 #[repr(C)]
 pub struct ScriptPtr {
@@ -86,20 +86,20 @@ pub struct ScriptPtr {
 impl ScriptPtr {
     fn get_cache<'a>() -> &'a mut HashMap<*const dyn Script, u32> {
         unsafe {
-            if let None = script_ptr_cache {
-                script_ptr_cache = Some(hashbrown::HashMap::new());
+            if let None = SCRIPT_PTR_CACHE {
+                SCRIPT_PTR_CACHE = Some(hashbrown::HashMap::new());
             }
-            let cache = script_ptr_cache.as_mut().unwrap();
+            let cache = SCRIPT_PTR_CACHE.as_mut().unwrap();
             cache
         }
     }
 
     fn get_reverse_cache<'a>() -> &'a mut HashMap<u32, Box<dyn Script>> {
         unsafe {
-            if let None = script_ptr_reverse_cache {
-                script_ptr_reverse_cache = Some(hashbrown::HashMap::new());
+            if let None = SCRIPT_PTR_REVERSE_CACHE {
+                SCRIPT_PTR_REVERSE_CACHE = Some(hashbrown::HashMap::new());
             }
-            let cache = script_ptr_reverse_cache.as_mut().unwrap();
+            let cache = SCRIPT_PTR_REVERSE_CACHE.as_mut().unwrap();
             cache
         }
     }
@@ -115,7 +115,7 @@ impl ScriptPtr {
             let cache = Self::get_cache();
             let mut index = cache.get(&(ptr.as_ref() as *const dyn Script)).cloned();
             if index.is_none() {
-                index = Some(script_index_counter.fetch_add(1, Ordering::SeqCst));
+                index = Some(SCRIPT_INDEX_COUNTER.fetch_add(1, Ordering::SeqCst));
                 let reverse_cache = Self::get_reverse_cache();
                 reverse_cache.insert(index.unwrap(), ptr);
 
@@ -133,16 +133,14 @@ impl ScriptPtr {
     }
 
     pub fn val<'a, 'b>(&'a self) -> Option<&'b dyn Script> {
-        unsafe {
-            if self.index == 0 {
-                return None;
-            }
-            let cache = Self::get_reverse_cache();
-            if let Some(c) = cache.get(&self.index) {
-                Some(c.as_ref())
-            } else {
-                None
-            }
+        if self.index == 0 {
+            return None;
+        }
+        let cache = Self::get_reverse_cache();
+        if let Some(c) = cache.get(&self.index) {
+            Some(c.as_ref())
+        } else {
+            None
         }
     }
 }
diff --git a/pkmn_lib_interface/src/utils.rs b/pkmn_lib_interface/src/utils.rs
index 9ca696a..44971bd 100755
--- a/pkmn_lib_interface/src/utils.rs
+++ b/pkmn_lib_interface/src/utils.rs
@@ -37,9 +37,6 @@ pub fn print_raw(s: &[u8]) {
 #[macro_export]
 macro_rules! println { ($($args:tt)*) => { pkmn_lib_interface::utils::print_raw(alloc::format!($($args)*).as_bytes()); } }
 
-#[macro_export]
-macro_rules! crate_println { ($($args:tt)*) => { crate::utils::print_raw(alloc::format!($($args)*).as_bytes()); } }
-
 #[macro_export]
 #[cfg(debug_assertions)]
 macro_rules! dbg { ($($args:tt)*) => { pkmn_lib_interface::utils::print_raw(alloc::format!($($args)*).as_bytes()); } }