diff --git a/inc/pbuf.h b/inc/pbuf.h
index ef303cd..082ffd7 100644
--- a/inc/pbuf.h
+++ b/inc/pbuf.h
@@ -160,8 +160,8 @@
 {
 	assert((p->length + sizeof(value)) <= p->capacity);
 	
-	*(p->payload + p->length) = value;
-
+	*p->payload++ = value;
+	
 	p->length += sizeof(value);
 }
 
@@ -170,8 +170,8 @@
 {
 	assert((p->length + sizeof(value)) <= p->capacity);
 	
-	*(p->payload + p->length + 0) = value;
-	*(p->payload + p->length + 1) = value >> 8;
+	*p->payload++ = value;
+	*p->payload++ = value >> 8;
 
 	p->length += sizeof(value);
 }
@@ -181,11 +181,11 @@
 {
 	assert((p->length + sizeof(value)) <= p->capacity);
 
-	*(p->payload + p->length + 0) = value;
-	*(p->payload + p->length + 1) = (value >> 8);
-	*(p->payload + p->length + 2) = (value >> 16);
-	*(p->payload + p->length + 3) = (value >> 24);
-		
+	*p->payload++ = value;
+	*p->payload++ = value >> 8;
+	*p->payload++ = value >> 16;
+	*p->payload++ = value >> 24;
+	
 	p->length += sizeof(value);
 }
 
@@ -197,10 +197,10 @@
 	
 	const uint32_t* const value_ptr = (uint32_t*)&value;
 
-	*(p->payload + p->length + 0) = *value_ptr;
-	*(p->payload + p->length + 1) = (*value_ptr >> 8);
-	*(p->payload + p->length + 2) = (*value_ptr >> 16);
-	*(p->payload + p->length + 3) = (*value_ptr >> 24);
+	*p->payload++ = *value_ptr;
+	*p->payload++ = *value_ptr >> 8;
+	*p->payload++ = *value_ptr >> 16;
+	*p->payload++ = *value_ptr >> 24;
 		
 	p->length += sizeof(value);
 }
@@ -209,17 +209,18 @@
 static inline void pbuf_insert_data(pbuf_t* p, const void* data, size_t size)
 {
 	assert((p->length + size) <= p->capacity);
-	memcpy(p->payload + p->length, data, size);
+	
+	memcpy(p->payload, data, size);
+	p->payload += size;
 	p->length += size;
 }
 
 
 static inline void pbuf_insert_str(pbuf_t* p, const char* str)
 {
-	uint8_t* ptr = p->payload + p->length;
 	while(*str && (p->length < p->capacity))
 	{
-		*ptr++ = *str++;
+		*p->payload++ = *str++;
 		p->length++;
 	}
 }
@@ -227,10 +228,9 @@
 
 static inline void pbuf_insert_nstr(pbuf_t* p, const char* str, size_t count)
 {
-	uint8_t* ptr = p->payload + p->length;
 	while(*str && (p->length < p->capacity) && count)
 	{
-		*ptr++ = *str++;
+		*p->payload++ = *str++;
 		p->length++;
 		count--;
 	}