2 files changed, 4 insertions, 8 deletions

diff --git a/toxcore/network.h b/toxcore/network.h
index aaf89f19..b0d306e4 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -149,7 +149,7 @@ typedef int sock_t;
 #define NET_PACKET_ONION_RECV_2 141
 #define NET_PACKET_ONION_RECV_1 142
 
-/* Only used for bootstrap servers */
+/* Only used for bootstrap nodes */
 #define BOOTSTRAP_INFO_PACKET_ID 240
 
 
diff --git a/toxcore/tox.c b/toxcore/tox.c
index bdef1eaa..0115e827 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -385,23 +385,19 @@ void tox_callback_status_message(Tox *tox, void (*function)(Messenger *tox, int,
 /* Set the callback for status type changes.
  *  function(int friendnumber, USERSTATUS kind)
  */
-void tox_callback_user_status(Tox *tox, void (*_function)(Tox *tox, int, TOX_USERSTATUS, void *), void *userdata)
+void tox_callback_user_status(Tox *tox, void (*function)(Messenger *tox, int, TOX_USERSTATUS, void *), void *userdata)
 {
     Messenger *m = tox;
-    typedef void (*function_type)(Messenger *, int, USERSTATUS, void *);
-    function_type function = (function_type)_function;
     m_callback_userstatus(m, function, userdata);
 }
 
 /* Set the callback for typing changes.
  *  function (int friendnumber, int is_typing)
  */
-void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int, int, void *), void *userdata)
+void tox_callback_typing_change(Tox *tox, void (*function)(Messenger *tox, int, int, void *), void *userdata)
 {
     Messenger *m = tox;
-    typedef void (*function_type)(Messenger *, int, int, void *);
-    function_type function_new = (function_type)function;
-    m_callback_typingchange(m, function_new, userdata);
+    m_callback_typingchange(m, function, userdata);
 }
 
 /* Set the callback for read receipts.