diff --git a/vlib/eventbus/eventbus.v b/vlib/eventbus/eventbus.v
index aef2e9db8f..c28e2098a5 100644
--- a/vlib/eventbus/eventbus.v
+++ b/vlib/eventbus/eventbus.v
@@ -1,6 +1,6 @@
 module eventbus
 
-pub type EventHandlerFn fn(voidptr, voidptr, voidptr)
+pub type EventHandlerFn fn(receiver voidptr, args voidptr, sender voidptr)
 
 pub struct Publisher {
 mut:
@@ -20,7 +20,7 @@ mut:
 struct EventHandler {
 	name string
 	handler EventHandlerFn
-	receiver voidptr
+	receiver voidptr = voidptr(0)
 	once bool
 }
 
@@ -64,11 +64,7 @@ fn (mut pb Publisher) publish(name string, sender voidptr, args voidptr) {
 			if event.once {
 				pb.registry.events.delete(i)
 			}
-			if event.receiver != 0 {
-				event.handler(event.receiver, args, sender)
-			} else {
-				event.handler(sender, args, voidptr(0))
-			}
+			event.handler(event.receiver, args, sender)
 		}
 	}
 }
@@ -87,7 +83,6 @@ pub fn (mut s Subscriber) subscribe(name string, handler EventHandlerFn) {
 	s.registry.events << EventHandler {
 		name: name
 		handler: handler
-		receiver: voidptr(0)
 	}
 }
 
@@ -103,7 +98,6 @@ pub fn (mut s Subscriber) subscribe_once(name string, handler EventHandlerFn) {
 	s.registry.events << EventHandler {
 		name: name
 		handler: handler
-		receiver: voidptr(0)
 		once: true
 	}
 }
diff --git a/vlib/net/websocket/ws_test.v b/vlib/net/websocket/ws_test.v
index d785f44b8d..10568922d6 100644
--- a/vlib/net/websocket/ws_test.v
+++ b/vlib/net/websocket/ws_test.v
@@ -4,8 +4,8 @@ import time
 struct Test {
 mut:
 	connected    bool = false
-	sended_msg   []string = []
-	recieved_msg []string = []
+	sent_messages     []string = []
+	received_messages []string = []
 }
 
 fn test_ws() {
@@ -25,7 +25,7 @@ fn ws_test(uri string) {
 	go ws.listen()
 	text := ['ws test', '{"vlang": "test0\n192"}']
 	for msg in text {
-		test.sended_msg << msg
+		test.sent_messages << msg
 		len := ws.write(msg.str, msg.len, .text_frame)
 		assert msg.len <= len
 		// sleep to give time to recieve response before send a new one
@@ -35,13 +35,13 @@ fn ws_test(uri string) {
 	time.sleep_ms(500)
 
 	assert test.connected == true
-	assert test.sended_msg.len == test.recieved_msg.len
-	for x, msg in test.sended_msg {
-		assert msg == test.recieved_msg[x]
+	assert test.sent_messages.len == test.received_messages.len
+	for x, msg in test.sent_messages {
+		assert msg == test.received_messages[x]
 	}
 }
 
-fn on_open(mut test Test, y voidptr, ws &websocket.Client) {
+fn on_open(mut test Test, x voidptr, ws &websocket.Client) {
 	println('websocket opened.')
 	test.connected = true
 }
@@ -50,17 +50,17 @@ fn on_message(mut test Test, msg &websocket.Message, ws &websocket.Client) {
 	typ := msg.opcode
 	if typ == .text_frame {
 		println('Message: ${cstring_to_vstring(msg.payload)}')
-		test.recieved_msg << cstring_to_vstring(msg.payload)
+		test.received_messages << cstring_to_vstring(msg.payload)
 	} else {
 		println('Binary message: $msg')
 	}
 }
 
-fn on_close(mut test Test, y voidptr, ws &websocket.Client) {
+fn on_close(x, y voidptr, ws &websocket.Client) {
 	println('websocket closed.')
 }
 
-fn on_error(ws &websocket.Client, x, y voidptr) {
+fn on_error(x, y voidptr, ws &websocket.Client) {
 	println('we have an error.')
 	assert false
 }